Merge fix for Bug#8870 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Mon, 27 Jun 2011 21:17:21 +0000 (17:17 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 27 Jun 2011 21:17:21 +0000 (17:17 -0400)
commit7e5938561388d4cbf83da158892d4b5da31b5e0f
tree9396521f9befdc603a3514c97edf93f9461ae496
parent4ad1d858d76175c8f967511d5238d9f71b8256f3
parent10af96bdb189e18269c25fee2ca22d3ca573eb8a
Merge fix for Bug#8870 from trunk